Revision: tla--star-merge-ancestor-bug--1.3--patch-1
Archive: jivera@flame.org--2004
Creator: Matthew Dempsky <jivera@flame.org>
Date: Wed Oct 27 15:56:07 CDT 2004
Standard-date: 2004-10-27 20:56:07 GMT
New-files: CONTRIBUTION-LOG tests/test-star-merge.sh
Modified-files: libarch/star-merge.c tests/Makefile.in
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0.2--patch-24
    jblack@gnuarch.org--2004/tla--devo--1.2--patch-28
    jivera@flame.org--2004/tla--star-merge-ancestor-bug--1.3--patch-1
Summary: fix "one-way" star-merge bug
Keywords: 

This patch fixes the star-merge case when MINE has an older latest patch
log entry from REFERENCE than THEIR's latest patch log entry.
